merge from trunk

author Joakim Verona <joakim@verona.se>

Fri, 13 Sep 2013 15:11:02 +0000 (17:11 +0200)

committer Joakim Verona <joakim@verona.se>

Fri, 13 Sep 2013 15:11:02 +0000 (17:11 +0200)
author Joakim Verona <joakim@verona.se>
Fri, 13 Sep 2013 15:11:02 +0000 (17:11 +0200)
committer Joakim Verona <joakim@verona.se>
Fri, 13 Sep 2013 15:11:02 +0000 (17:11 +0200)
diff --cc src/xdisp.c
Simple merge
diff --cc src/xterm.c
Simple merge
author	Joakim Verona <joakim@verona.se>
	Fri, 13 Sep 2013 15:11:02 +0000 (17:11 +0200)
committer	Joakim Verona <joakim@verona.se>
	Fri, 13 Sep 2013 15:11:02 +0000 (17:11 +0200)
		1	2
src/xdisp.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xterm.c	patch \|	diff1 \|	diff2 \|	blob \| history